From ce45a240593a00a3dcc00eca1f9ac9b587423373 Mon Sep 17 00:00:00 2001 From: "fred@xuni-t01.sc.intel.com" Date: Tue, 9 Aug 2005 02:32:52 -0800 Subject: [PATCH] Accomodate ia64-xenolinux change where xen-public is symlinked to xen source now. Signed-off-by Kevin Tian --- xen/arch/ia64/Rules.mk | 2 +- xen/include/public/arch-ia64.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk index 69a78471b2..f27b886c70 100644 --- a/xen/arch/ia64/Rules.mk +++ b/xen/arch/ia64/Rules.mk @@ -22,7 +22,7 @@ CFLAGS += -I$(BASEDIR)/include/asm-ia64 -I$(BASEDIR)/include/asm-ia64/linux \ -I$(BASEDIR)/include/asm-ia64/linux-xen \ -I$(BASEDIR)/arch/ia64/linux -I$(BASEDIR)/arch/ia64/linux-xen CFLAGS += -Wno-pointer-arith -Wredundant-decls -CFLAGS += -DIA64 -DXEN -DLINUX_2_6 +CFLAGS += -DIA64 -DXEN -DLINUX_2_6 -DXEN_HYPERVISOR CFLAGS += -ffixed-r13 -mfixed-range=f12-f15,f32-f127 CFLAGS += -w -g ifeq ($(CONFIG_VTI),y) diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h index 750ec7fae7..32a43062f3 100644 --- a/xen/include/public/arch-ia64.h +++ b/xen/include/public/arch-ia64.h @@ -57,7 +57,11 @@ struct pt_fpreg { } u; }; +#ifdef XEN_HYPERVISOR struct pt_regs { +#else +struct xen_pt_regs { +#endif /* The following registers are saved by SAVE_MIN: */ unsigned long b6; /* scratch */ unsigned long b7; /* scratch */ @@ -274,7 +278,11 @@ typedef struct vcpu_guest_context { unsigned long vm_assist; /* VMASST_TYPE_* bitmap, now none on IPF */ unsigned long guest_iip; /* Guest entry point */ +#ifdef XEN_HYPERVISOR struct pt_regs regs; +#else + struct xen_pt_regs regs; +#endif arch_vcpu_info_t vcpu; arch_shared_info_t shared; } vcpu_guest_context_t; -- 2.30.2